From ff725da85a28bda7e4394ce5337785c0ade4acf1 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Fri, 23 Aug 2013 17:07:40 +0000 Subject: [PATCH] How many times do I have to kill axim and psp? Die, die, die! git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4559 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/Makefile.in | 4 +--- gpsbabel/{ => deprecated}/README.psp | 0 gpsbabel/{ => deprecated}/axim_gpb.cc | 0 gpsbabel/format_skeleton.cc | 2 +- gpsbabel/testo.d/{ => deprecated}/axim.test | 0 gpsbabel/vecs.cc | 7 ------- 6 files changed, 2 insertions(+), 11 deletions(-) rename gpsbabel/{ => deprecated}/README.psp (100%) rename gpsbabel/{ => deprecated}/axim_gpb.cc (100%) rename gpsbabel/testo.d/{ => deprecated}/axim.test (100%) diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in index 283020707..0bbf445fa 100644 --- a/gpsbabel/Makefile.in +++ b/gpsbabel/Makefile.in @@ -74,7 +74,7 @@ ALL_FMTS=$(MINIMAL_FMTS) gtm.o gpsutil.o \ vcf.o overlay.o google.o xhtmlent.o lowranceusr.o an1.o tomtom.o \ tef_xml.o maggeo.o vitosmt.o bcr.o \ ignrando.o stmwpp.o cst.o nmn4.o compegps.o \ - yahoo.o unicsv.o wfff_xml.o garmin_txt.o axim_gpb.o gpssim.o \ + yahoo.o unicsv.o wfff_xml.o garmin_txt.o gpssim.o \ stmsdf.o dmtlog.o raymarine.o alan.o vitovtt.o \ ggv_log.o g7towin.o garmin_gpi.o lmx.o random.o xol.o dg-100.o \ navilink.o mtk_logger.o ik3d.o osm.o destinator.o exif.o vidaone.o \ @@ -423,8 +423,6 @@ an1.o: an1.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \ arcdist.o: arcdist.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ filterdefs.h grtcirc.h -axim_gpb.o: axim_gpb.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ - gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h bcr.o: bcr.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \ cet.h cet_util.h inifile.h session.h src/core/datetime.h csv_util.h \ garmin_tables.h diff --git a/gpsbabel/README.psp b/gpsbabel/deprecated/README.psp similarity index 100% rename from gpsbabel/README.psp rename to gpsbabel/deprecated/README.psp diff --git a/gpsbabel/axim_gpb.cc b/gpsbabel/deprecated/axim_gpb.cc similarity index 100% rename from gpsbabel/axim_gpb.cc rename to gpsbabel/deprecated/axim_gpb.cc diff --git a/gpsbabel/format_skeleton.cc b/gpsbabel/format_skeleton.cc index 3c68527f3..78a87b72d 100644 --- a/gpsbabel/format_skeleton.cc +++ b/gpsbabel/format_skeleton.cc @@ -138,7 +138,7 @@ format_skeleton_exit(void) /* optional */ ff_vecs_t format_skeleton_vecs = { ff_type_file, { - ff_cap_read | ff_cap_write /* waypoints */, + (ff_cap)(ff_cap_read | ff_cap_write) /* waypoints */, ff_cap_none /* tracks */, ff_cap_none /* routes */ }, diff --git a/gpsbabel/testo.d/axim.test b/gpsbabel/testo.d/deprecated/axim.test similarity index 100% rename from gpsbabel/testo.d/axim.test rename to gpsbabel/testo.d/deprecated/axim.test diff --git a/gpsbabel/vecs.cc b/gpsbabel/vecs.cc index 5a9b1e04e..6053dabcf 100644 --- a/gpsbabel/vecs.cc +++ b/gpsbabel/vecs.cc @@ -36,7 +36,6 @@ typedef struct { } vecs_t; extern ff_vecs_t an1_vecs; -extern ff_vecs_t axim_gpb_vecs; extern ff_vecs_t bcr_vecs; extern ff_vecs_t brauniger_iq_vecs; extern ff_vecs_t cetus_vecs; @@ -606,12 +605,6 @@ vecs_t vec_list[] = { "txt" }, #endif // CSVFMTS_ENABLED - { - &axim_gpb_vecs, - "axim_gpb", - "Dell Axim Navigation System (.gpb) file format", - "gpb" - }, { >c_vecs, "gtrnctr", -- 2.30.2